From 7da50bef11605fa3ffd1fb8726350f5e7e5d9b6b Mon Sep 17 00:00:00 2001 From: Pascal Packaging Team Date: Wed, 8 Feb 2017 09:53:35 +0000 Subject: [PATCH] find_iconv_in_libc_on_debian =================================================================== Gbp-Pq: Name find_iconv_in_libc_on_debian.patch --- fpcsrc/rtl/unix/cwstring.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fpcsrc/rtl/unix/cwstring.pp b/fpcsrc/rtl/unix/cwstring.pp index f6d1d709..80cf80f8 100644 --- a/fpcsrc/rtl/unix/cwstring.pp +++ b/fpcsrc/rtl/unix/cwstring.pp @@ -26,9 +26,10 @@ procedure SetCWidestringManager; implementation {$linklib c} +{$define debian} // Linux (and maybe glibc platforms in general), have iconv in glibc. -{$if defined(linux) or defined(solaris)} +{$if defined(linux) or defined(solaris) or defined(debian)} {$define iconv_is_in_libc} {$endif} @@ -102,7 +103,7 @@ function mblen(const s: pchar; n: size_t): size_t; cdecl; external clib name 'mb const -{$if defined(linux)} +{$if defined(linux) or defined(debian)} __LC_CTYPE = 0; LC_ALL = 6; _NL_CTYPE_CLASS = (__LC_CTYPE shl 16); @@ -195,7 +196,7 @@ type {$endif} {$endif} -{$if (not defined(bsd) and not defined(beos)) or defined(iconv_is_in_libc) or (defined(darwin) and not defined(cpupowerpc32))} +{$if (not defined(bsd) and not defined(beos)) or defined(iconv_is_in_libc) or (defined(darwin) and not defined(cpupowerpc32)) or defined(debian)} function iconv_open(__tocode:pchar; __fromcode:pchar):iconv_t;cdecl;external libiconvname name 'iconv_open'; function iconv(__cd:iconv_t; __inbuf:ppchar; __inbytesleft:psize_t; __outbuf:ppchar; __outbytesleft:psize_t):size_t;cdecl;external libiconvname name 'iconv'; function iconv_close(__cd:iconv_t):cint;cdecl;external libiconvname name 'iconv_close'; -- 2.30.2